fix: preserve MCP session across tool calls #2526
Open
+5
−2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using remote MCP servers, closing the HTTP connection after listing tools causes the server to terminate the session. This PR prevents the SDK from terminating the MCP session after the first interaction. It updates
ResponseStreamManager.__exit__
andAsyncResponseStreamManager.__aexit__
so they only close the stream when no MCP tools are present. This preserves the session for subsequent tool calls.Changes being requested
__exit__
and__aexit__
when any input tool hastype == "mcp"
, ensuring MCP session persists across tool calls.Additional context & links
Fixes #2513.
See related discussion on the GitHub MCP server issue #702.